Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Feb 2011 01:32:13 +0000 (17:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Feb 2011 01:32:13 +0000 (17:32 -0800)

Trivial merge